pcmcia/ti_pci1410a: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 8eb4982dfbfef8b059141c61e12d71d15bdcafed..ba251d0984af2c580cfb5b13ea51da7d54c511db 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -29,7 +29,7 @@ COBJS-$(CONFIG_I82365) += i82365.o
 COBJS-y += mpc8xx_pcmcia.o
 COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
 COBJS-y += rpx_pcmcia.o
-COBJS-y += ti_pci1410a.o
+COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
 COBJS-y += tqm8xx_pcmcia.o
 COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
 

diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c
index 208ca50a743ecb88b56ab8daa6665f85d19ee65f..c876d0c402556126d2953af71f30ac35b297be51 100644 (file)
--- a/drivers/pcmcia/ti_pci1410a.c
+++ b/drivers/pcmcia/ti_pci1410a.c
@@ -64,7 +64,7 @@
 
 #include <pcmcia.h>
 
-#if defined(CONFIG_CMD_PCMCIA) && defined(CONFIG_IDE_TI_CARDBUS)
+#if defined(CONFIG_CMD_PCMCIA)
 
 int pcmcia_on(int ide_base_bus);
 
@@ -662,4 +662,4 @@ static int identify(volatile uchar *p)
        return 0;       /* don't know */
 }
 
-#endif /* CONFIG_IDE_TI_CARDBUS */
+#endif /* CONFIG_CMD_PCMCIA */